方法一

vi informs.php

改好後

git add informs.php

git commit
會出現
[master dc97d36] Merge branch 'master' of 172.19.xx.xx:Server/xxx_server

git push
會出現
Counting objects: 50, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (50/50), done.
Writing objects: 100% (50/50), 6.86 KiB | 0 bytes/s, done.
Total 50 (delta 36), reused 0 (delta 0)
To git@172.19.76.10:shaun/xxxx_server.git
   c21f788..dc97d36  master -> master

git pull main master
From 172.19.xx.xx:Server/xxx_server
 * branch            master     -> FETCH_HEAD
Already up-to-date.

完成

========================================================

情境二

我已經commit 至 git lab xxx
然後要merge 至 server 的 master
出現了 conflict

回到本機

$ git status

    Unmerged paths:
      (use "git add/rm ..." as appropriate to mark resolution)

        deleted by them: documents/admin.html
    
    
$ git rm documents/admin.html 
    You have not concluded your merge (MERGE_HEAD exists).
    Please, commit your changes before you can merge.
    xxx-mini:Cosmed_server xxx$ git status
    On branch master
    Your branch is up-to-date with 'origin/master'.
    All conflicts fixed but you are still merging.
      (use "git commit" to conclude merge)

    Changes to be committed:

        modified:   .gitignore
        deleted:    documents/admin.html
        modified:   raml/admin.raml
        modified:   raml/libraries/front_end/dms-type.raml

$ git commit
    [master 15f91dc] Merge branch 'master' of 172.19.xx.xx:Server/專案_server

$ git push
    Counting objects: 16, done.
    Delta compression using up to 4 threads.
    Compressing objects: 100% (16/16), done.
    Writing objects: 100% (16/16), 1.81 KiB | 0 bytes/s, done.
    Total 16 (delta 12), reused 0 (delta 0)
    To git@172.19.xx.xx:人名/xxx_server.git
       f2d5e91..15f91dc  master -> master

$ git pull main master
    From 172.19.xx.xx:Server/專案_server
     * branch            master     -> FETCH_HEAD
    Already up-to-date.
    
    
    這樣就過了